Adopt prio 0.15.0
#1916
Merged
Adopt prio 0.15.0
#1916
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tgeoghegan
commented
Sep 12, 2023
| @@ -20,7 +20,7 @@ hex = "0.4" | |||
| num_enum = "0.7.0" | |||
| # We can't pull prio in from the workspace because that would enable default features, and we do not | |||
| # want prio/crypto-dependencies | |||
| prio = { version = "0.14.1", features = ["multithreaded"] } | |||
| prio = { version = "0.15.0", default-features = false, features = ["multithreaded"] } | |||
There was a problem hiding this comment.
This fixes a bug I introduced in #1805: we should not enable default features on prio in janus_messages.
inahga
approved these changes
Sep 12, 2023
core/src/task.rs
Outdated
| 2, | ||
| *bits, | ||
| *length, | ||
| janus_core::task::VdafInstance::chunk_size(*length), |
There was a problem hiding this comment.
We'll want to compute this from the total encoded measurement length (since the validity circuit only cares about bits, not our vector of integers)
Suggested change
| janus_core::task::VdafInstance::chunk_size(*length), | |
| janus_core::task::VdafInstance::chunk_size(*bits * *length), |
| 2, | ||
| *bits, | ||
| *length, | ||
| VdafInstance::chunk_size(*length), |
There was a problem hiding this comment.
Same here
Suggested change
| VdafInstance::chunk_size(*length), | |
| VdafInstance::chunk_size(*bits * *length), |
| 2, | ||
| *bits, | ||
| *length, | ||
| VdafInstance::chunk_size(*length), |
There was a problem hiding this comment.
Suggested change
| VdafInstance::chunk_size(*length), | |
| VdafInstance::chunk_size(*bits * *length), |
| 2, | ||
| *bits, | ||
| *length, | ||
| VdafInstance::chunk_size(*length), |
There was a problem hiding this comment.
Suggested change
| VdafInstance::chunk_size(*length), | |
| VdafInstance::chunk_size(*bits * *length), |
| let vdaf_client = Prio3::new_sum_vec_multithreaded(2, bits, length) | ||
| .context("failed to construct Prio3SumVec VDAF")?; | ||
| let vdaf_client = | ||
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(length)) |
There was a problem hiding this comment.
Suggested change
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(length)) | |
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(bits * length)) |
| let vdaf = Prio3::new_sum_vec_multithreaded(2, bits, length) | ||
| .context("failed to construct Prio3SumVec VDAF")?; | ||
| let vdaf = | ||
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(length)) |
There was a problem hiding this comment.
Suggested change
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(length)) | |
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(bits * length)) |
| let vdaf = Prio3::new_sum_vec_multithreaded(2, bits, length) | ||
| .context("failed to construct Prio3SumVec VDAF")?; | ||
| let vdaf = | ||
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(length)) |
There was a problem hiding this comment.
Suggested change
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(length)) | |
| Prio3::new_sum_vec_multithreaded(2, bits, length, VdafInstance::chunk_size(bits * length)) |
tools/src/bin/collect.rs
Outdated
| @@ -463,14 +467,15 @@ where | |||
| .map_err(|err| Error::Anyhow(err.into())) | |||
| } | |||
| (VdafType::SumVec, Some(length), Some(bits)) => { | |||
| let vdaf = | |||
| Prio3::new_sum_vec(2, bits, length).map_err(|err| Error::Anyhow(err.into()))?; | |||
| let vdaf = Prio3::new_sum_vec(2, bits, length, VdafInstance::chunk_size(length)) | |||
There was a problem hiding this comment.
Suggested change
| let vdaf = Prio3::new_sum_vec(2, bits, length, VdafInstance::chunk_size(length)) | |
| let vdaf = Prio3::new_sum_vec(2, bits, length, VdafInstance::chunk_size(bits * length)) |
aggregator/src/aggregator.rs
Outdated
| 2, | ||
| *bits, | ||
| *length, | ||
| VdafInstance::chunk_size(*length), |
There was a problem hiding this comment.
Suggested change
| VdafInstance::chunk_size(*length), | |
| VdafInstance::chunk_size(*bits * *length), |
tgeoghegan
force-pushed
the
timg/prio-0.15.0
branch
from
ac8f5fb to
4bbe28d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.